From ba039bcce56ce92ebc00fd1baedebe511572b487 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 15 Apr 2020 20:27:15 +0200
Subject: [PATCH] dbusServices/extensions: Remove event box

In GTK4, all widgets are reactive, and therefore GtkEventBox has
been removed. In order to make the upcoming GTK4 port a bit cleaner,
remove the expander's event box now.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1495>
---
 .../extensions/css/application.css            |  3 +-
 .../extensions/ui/extension-prefs-dialog.ui   | 32 ++++++++-----------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/js/dbusServices/extensions/css/application.css b/js/dbusServices/extensions/css/application.css
index fb7c47556..133e858f5 100644
--- a/js/dbusServices/extensions/css/application.css
+++ b/js/dbusServices/extensions/css/application.css
@@ -1,4 +1,5 @@
-.expanded { border: 0 solid @borders; border-bottom-width: 1px; }
+.expander { padding: 12px; }
+.expander.expanded { border: 0 solid @borders; border-bottom-width: 1px; }
 .expander-toolbar {
   border: 0 solid @borders;
   border-top-width: 1px;
diff --git a/js/dbusServices/extensions/ui/extension-prefs-dialog.ui b/js/dbusServices/extensions/ui/extension-prefs-dialog.ui
index 9e51e3c58..851adbf76 100644
--- a/js/dbusServices/extensions/ui/extension-prefs-dialog.ui
+++ b/js/dbusServices/extensions/ui/extension-prefs-dialog.ui
@@ -62,28 +62,22 @@
                             <property name="hexpand">True</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkEventBox" id="expander">
+                              <object class="GtkBox" id="expander">
                                 <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <style>
+                                  <class name="expander"/>
+                                </style>
                                 <child>
-                                  <object class="GtkBox">
+                                  <object class="GtkImage" id="expanderArrow">
                                     <property name="visible">True</property>
-                                    <property name="margin-start">12</property>
-                                    <property name="margin-end">12</property>
-                                    <property name="margin-top">12</property>
-                                    <property name="margin-bottom">12</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkImage" id="expanderArrow">
-                                        <property name="visible">True</property>
-                                        <property name="icon-name">pan-end-symbolic</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="visible">True</property>
-                                        <property name="label" translatable="yes">Technical Details</property>
-                                      </object>
-                                    </child>
+                                    <property name="icon-name">pan-end-symbolic</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Technical Details</property>
                                   </object>
                                 </child>
                               </object>
-- 
2.39.5